Fixes and code cleanup for ioa_