Fixes - MVDM