one line fixes to copied code from old versions