Coreos fixes