Fixes for kw widget