changes to remove warnings from g++, part1