Fixes in pupdial and in remasterpup2