Fix a couple of bug warnings