Update for compiler changes.