small changes to silence harmless warnings with g++ -Wall