Fix fileset handling