Patches to make the old shim data work, and added support for actually changing the active source...