internal/v4: minor changes for review