Fix Backend Bugs by Asem Abdou