Small adjustments for the set language functionality