More patches

m7