Fixes for pods refactor