Cropuploader / general fixes