Lang bugs fixed