Implement config changes discussed on IRC