Address some comments from Nick Coghlan