Fixes for aoi-plugins work