Fixes for gcc 3.0.