Minor fixes from Colin's review