Minor tweaks to compile.