Fix bugs introduced by new MM
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml
Fix bug introduced by new MM