Fixes for new blockers on v-30 tag build done