Fixes for recent changes to pdbfixer