S2M bug fixes for D8 beta2