fix patches to get correctely work of them (and clean up)