Complete the upgrader
Fix oops in html-thread migration script