Mesa changes
Fix debug crash at the end using dummy.