Some enhancements for short and long click events