Bugs resolved related to locate/focus