Added "fixes" in an attempt to get code working on gluster