cinder fixes