Fixes for OEA