Little fixes from Steve Purcell's review

Thank you very much Steve.