Fixing the bugs created by backend changes