Fixes and MM intergration