More MySQL compatibility work