Re-enabling shield for C++ plus other small changes