Minor kami fixes