Fix errors from transition to more detailed registered sources