Minor bug fixes in focus.