Fix some logic to avoid using single_package bool