Change things that should've been changed long ago.