More compile problems w/ latest CVS