Minor and linter fix