few small consistency changes
Merge pull request #2317 from awesomerobot/master

few small consistency changes