More fixes on klda.