Fixing the build, plus placating -Wall
Enabling -Werror to help enforce future hygiene