Linting and fixed broken compiling