Werror fixes