Fixed up some more cmake errors