Kisumu HDSS Companion Fixes and Improvements

See specific commits for details.