Package config files fixed
Minor Cmake fixes