Updates to make it compile again.