Minor changes to help downstream Riak project
This closes #327