Some minor docs & messages change