Minor changes to address Sacha's review