More effc++ fixing
More