Minor Bugs Fixeds