Minor fixes to latest regressions.
Use the improved MySQL API.