Final fixes for uploads. Now working.