Minor improvements for uploads