Project contributors replacements and fix