Minor Bugs Fix