Fixing rest calls