Fix a couple issues