Fix the issue with mismatched assemblies
Fix build errors