[Newbuild/Sync] Fixed all outstanding cmake compile changes

Todo: Tools