Fixes in lang module