Some minor adjustments for file name retrieval and line number counting