consistency fixes
Merge pull request #813 from tshepang/temp

consistency fixes