Build script and lint fixes