Minor changes to help downstream Riak project