minor c++ ification and conformance flags