Fixed some marker focus bugs