Fixed LocationValidator errors
Merge branch 'grid-cleanup-part-deux'