Fixes for panic on CoreOS (docker 1.0.x)