Minor fixes for compilation.