More fixes from review