Fix a Few Bugs