Small language improvements