More work on MySQL support