Got rid of some warnings (g++ -Wextra)

This way people using -Wextra will get less warnings..