More fixes for focus issue