Minor changes on cinder part