minor adjustments before migration to main SDK