Some lang fixes