Fixed Couple Bugs