Minor resharping
Fixing some issues found with code analysis
Merge branch 'master' of https://pauldendulk:Htc-3300@github.com/BruTile/BruTile.git