Replace missing Xync type info annotations.
Fix build issues.