Fix issues for Kowari