Bugfixes in Kind server