ACF compatibility fixes