round 2 fixups