cpp: Type updates
cpp: Further fixes