Few language fixes