Small Bugs Fixed