Fixes in POD