Fixed M3 breaking changes