Tweak debug output format
Record correct origin filename