Some lang changes