Improve file/line decoding