more pull review fixes