Several fixes in POD; cosmetic changes