Some more things in the c++ side.