Fixes for new temp LFN scheme.