Fix some warnings with GCC 4.9