Fixes for the filesystem generator.