Hit Detection fixes