Make the code -Werror safe