Change things that broke with 24.4