some consistency fixes
Merge pull request #935 from tshepang/consistency

some consistency fixes