Round start/end fixes