More lang fixes