Changes for MySQL compatibility