Fix cinder and neutron issues

A few issues with cinder and neutron fixed.
Code style fixes.