Modified minor details in gestures and utils