Make things work with the last compiler.