Updated to match SDL2 updates