style fixes and build script fix