Minor changes to satisfy linter