smallish lang fixes