Fixes to Subset.java