Horizon's fixes for Havana

and some else