munit fixes