Other misc changes to allow cmake to generate files.