more kw fixes