add some gcc 4.0 fixes