Fixing REST responses