Misc language fixes