Fixed few things in Lang