PodsUI fixes