first round fixes for livetest