Fixing Cinder and Neutron