More FS fixes.