Fixes in FindFiles and FixBSN