Fixes for ACF compatibility