fixes to work with mysql-client