Small fixes about critical hits counting