review fixes - part 2