kie-remote: proactive fixes
(cherry picked from commit 017baa175fa5f8c2c72bbb9f0a531719b65debd0)