Fix remaining FS parts