Couple of fixes for build errors with mdv