Fixed find_package problems