WIP: Fix sourcing