Fix lang files and make functions private