Fixes and cleanups to filesystem...