More fixes (mostly Filesystem)