Fixes and changes for M3