Minor fixes. Still uncompilable.