fixing more duplicates and build errors