Remove duplicates & Fix build