Add some changes to volume commit code which was broken