Language tweaks

Another pick from #1011