Fix compat issues for configuration