Fixed a few lang bugs