fixes for kanda