Fixes for new AoiCropping