Minor fixes for KL debugging