Fixes and remove duplicates