Added backend fixes.