Minor fixes, though upload was broken again