Fix POD bugs
Release 4.01003