last minute fixes to earlier commit