EffC++ warnings corrected.