Update for latest compiler