Random acts of bug squashing

and another catch of disappeared changes in the last merge