Some minor modifications to the config