Filesystem fixes and map path fix.