Tweaks to location object