More changes to get Riak setup working.