Minor fixes on klda