Small lang fixes