Fix code style stuff from build system