Couple of fixes for distribute:s3