Tweaks to get things to compile.