Updating config to fix issues