Fixes for Innodb engine.