Fixing Lang and other stuff.