[SDL2] Minor fixes and cleanup