Upload wrappers with Unix and Windows CPU time accounting fixes