[NTFS] - Add some improvements to the previous commit, as suggested by Thomas.