Small changes coming from review session.