A few more tweaks for language