second batch of cppfuckup fixes