Fixes for ace integration