Filesystem and messages fixes.