Review fixes. Finer details missed