Some Minor Bugs