Small fixes to earlier commit