fixes to locations