VG-1893: Fixes to better handle mxd's