Fix some warnings with newer GCC