Fix referencing issues that cause source enable/disable to revert