MM bug fixes