Fixes for mysql::server