Fix rest errors