Fixes for OIMM