G++3 fixes from Randolph