Fixed focus issues