More tweaks to Cinder entry