Fix m7 build