metomi/rose#225: add fixes