- minor fixes for kwc