yet more lovely updates for havana compat