some fixes in round3