Fix Minor Bugs