Fixed 2 issues about Tuple factories