Quick update to fix breaking changes in M4 release