More Bugs Fixed