Some fixes and improovements for datastream uploads.

Message should probably be wrapped in `t()`.