Additional fixes for fMRI version.