Distribution fix, minor regression fix for nginx, riak, couchdb