Fix the config stuff right.