Fixes for click handling in #2023