Fixes with slow and focusclosestWay