Multiple rounds - some fixes