More warnings removed - these ones appeared on gcc 4.7 on Linux