Some minor fixes in lang