Various compile fixes

Our branch also still has the CXX03. Not sure what we want to do about this.