Fix all Rest issues