Make things work with the new compiler.