Minor changes to config code.