Fixes for uploads including intiial Session stuff