Fixes to compilation.