Changed build configurations to match those discusses in #1523