Small set of patches to allow a headless server be built.