Quicky Update - Cinder

Fixed several broken things