build management support fixes