Few fixes in LFS

Signed-off-by: moojit <moojit@outlook.com>