Fixes for newer Cowboys