Linting and some fixes