Language small fixes