Fix various -Werror annoyances