Minor fixes for uploading