Merge some changes in kitteneitor by hand.