mariadb related fixes