Additional fixes to remove g++ warnings