Minor changes for C++03 repo

A few non minor changes to improve code quality.