kitstuff fixes