YCSB fixes. Issue #426