Improve compatibility with CoreOS