YCSB Fixes. ISsue #437