another bundle of fixes