Clean up and minor bugs for config change