Fixing some syntactic and build system stupidity