Fixing some conflicting errors in PDODriver and Model