More SDL 2 fixes