Updates to make things work properly with InnoDB