More update script fixes