User upload bug fixes