Some changes to make upgrading to SDL2 a tiny bit easier