Minor language improvements