Fixes for PDL

Relates to #23