minor changes to make sure gcc/g++ runs without warnings