Fix Some Minor Bugs