Missed a few areas that needed to be changed to Sets as well.