Remove a couple of ROI handling bugs.