more ad hoc patches