Fixed defaults and out-of-the-box build