Minor fixes from review