2 Bugs Fixed