More fixes to compile.