Improves for mirage-* libraries