More SDL2 fixes