Interim - further SDL2 adjustments