More attempts to fix the sourcing problems...