Fixes #1636 & #1042: Returns the REST adapter guide

* Minor code updates