Partial fixes
Merge pull request #255 from korczis/rest-merge

Partial fixes