Round start fixes