more mml bug fixes