Added a couple config settings to help debugging