Fixing duplicates & build errors