Fixing the obvious stuff mar77i forgot to fix in his patch fixing the obvious stuff.