More changes to image upload stuff