Update to work with the last compiler.