REST helper fixes.