Few more fixes
Merge pull request #253 from korczis/rest-merge

Few more fixes