Fixed Bugs (Comdi + Requests)