Update for latest elm changes