Kirlin misc fixes