Some fixes in POD