Linter fixes

Just a couple of minor linter fixes and a simplified method for getting the current site.