Second round of corrections.
It compiles again.