Pick missed fixes to havana