Small fixes from review