Fix several Subset Bugs