Fix build error with updated tools