Fix stuff in the PDO layer