Corrections following sdrapeau review