Fix compilation errors introduced by -Werror