Fix a couple build errors