more painful minor fixes