Changes update for last two POD tweaks