minor kami fixes