NEWSOURCE-200: Fixing PCGen complaints (errors and duplicates)