style fixes + -Werror