Fix clickthrough issues