minor fixes to 3.6 to 3.9.2 db migration