Fix hit testing regressions