bootstrap build fixes