Some more SuperPDO fixes