Final stable havana fixes

Doesn't look like it.