Fix some problem with hit objects