Last compiler errors fixed, compile succeeds.