Further iterations towards MySQL compatibility