Minor Bugs Fixed