User upload fixes