Updated remaining CMakeFiles wrt new lib names.
Also got rid of a couple of warnings.