Merge pull request #296 from qiangdavidliu/2.x

Fix up server configs