Fixes for MySQL 5.5