This fixes a few issues which are apparent when using clang.
assigned to @wdconinc
enabled an automatic merge when the pipeline for 3db9c443 succeeds
canceled the automatic merge
merged