Fixes to location presentation