More hacks to config utils