More lang fixes
Merge pull request #1544 from cyb3rm4n/master

More language fixes