Fix the timer and gesture locking