Fix pod issues