Fixing 1.8 upgrade script