[CYB-95] -- Fixed minor backend code