Tweaks to make it compile.