Fixed up the build errors (hopefully)