For some reason these changes didn't make it through.