Small fixes with for MariaDB