Several mostly minor changes in cinder 

I can split this into separate commits if needed..