Fix optional FindPackage customization