First commit fixes a critical bug which can corrupt the file system.
Second commit fixes a bug which leads to failures when accessing more than one file concurrently (as it happens during boot).
