Some fixes for M&G