Tweaks for #1372
Fixes for PodsUI row handling