Effective C++ corrections (T.Pocheptsov)