Several minor fixes to work with the new Source object