More fixes for compilation.