Bugfixes for uploader