Some adjustments for CoreOS