Some fixes for new Corund build.