Fix m8 build