Fixed bugs with touch indicators