Various config updates