Fixes for Cinder