Fix issues with hit testing