Some generic patches