a slew of PODs fixes