backported some small fixes for velbus