Various config updates
Updates