Fixing code errors.(OMS-520)