Fixed first round issues