Fixing Minor Bugs