Tweaks to make things compile.