Fixes to grammer suggested by Arx