fixed some more warnings

gcc 4.7 again