Tweak schema script
Fix PDO issues