Changes for coreos