fix problems from review