More restful fixes