Some Bugs Fixed