Some upload template changes I don't remember the details of...