Few more fixes
Fix few more errors
Merge pull request #252 from korczis/rest-merge

Rest merge