Lint and coverage fixes