Fix Linting errors and build
Build again