Fixed up some build errors