Pdb fixes

Addresses #87.