Some minor fixes so that we can default to a flask xen.