M6 bugfixing spree