Cleanup to build on -Wall -Werror