Fixed ongoing migration issues with hibernate inflation