Temp fixes for compilation.