Some GPU changes