Some fixes; now compiles.