Cleanup and fixes for wip-ceph-disk

Some cleanups for wip-ceph-disk branch (from pull request #117 )