Few more SDL2 fixes