Some minor changes of hit logic