Final stable havana fixes