Fixes #895 - Upgrade30.php bugs

#895