Changes to be more in line with upstream.