Fixed some issues in location