Finalized files handling
Improved locale behavior