PDB fixes