Fix recent changes for config-prefix