Work a bit on end-of-round interface