Cinder fixes