Fix a few paste upload bugs

Fixes https://www.pivotaltracker.com/story/show/66994990