Fix rest errors

:sunny: READY TO BE MERGED :sunny: