Fixes on 2.5+ restful plugin