wheels: various small fixes