CPP fixes for 7.8 RC2