Fix the bugs in the npdm container.