Lint and other fixes