Merge "Fixup some returns, documentation"