Minor fixes in kiakai