Fixes #895 Upgrade30.php bugs
Fixes #895 Upgrade30.php bugs