Some minor language improvements

First