Updates following jmarshallnz's review