Fixed re-sourcing, and dealiasing of functions