[Change] various small fixes