Fixes for 'pdn'