Small fixes for consistency with scripts in Vervaeke2010 project.