Cleanup and fixes fro wip-ceph-disk