Fixes and updates for M3