Partial fixes to disallow duplicate sources