Some language improvements