Fixed up a few build errors