Arvind - Tweaking location helpers