Fix build errors involving HashSet