Language fixups