More bare build fixes