Minor changes needed to upgrade to Ceph 0.87