Fix issues re: Scotch image upload