Fixing up some long standing 'errors'