Bugfixes in focus activity