Click capture bug fixes and improvements