Fix missing casts for c++