Some minor language improvements