Improvements to SDL2 stage