Build fixes for gcc 4.1.2.