MySQL migration part 1:  more minor fixes