Fix a Couple of Bugs