Finish off mariadb for #21