Linting and small fixes