Minor fixes to compile.