Added Kattio and other fixes