mdi behaviours, fixes