Fix DIRECTSAVEPATH logic for different PUPMODEs