Fixed pod issues