[haida] minor fixes