Fixes to allow single (fixed or moving) mask in ROI mode