#499 - Misc fixes for location & tenant