Updated to match latest changes in sdl2_window