more patches fixed