SDL2 fixes