Tuning fixes for MariaDB 10.0