Small fixes from linting