Lang tweaks

Picks from #1011