Fixes and a few additional ports to get test:mri19 green.

Additional fixes to get test:mri18 green.