More upgrade sql script fixes