Build Fix (may revert back to old settings)

If these don't work, may revert back to old settings