Added a couple of SDL2 related fixes.