3.8: capebus improvements by mranostay

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>