Fixed Minor Bugs