Minor fixes to return values.
Merge pull request #710 from patzim/master

Minor fixes to return values.