Upgrade to M6. Bunch of fixes.