Fixes for Riak under Clocker