Convert to build with gcc2