Fix some warnings that triggered errors with some compilers