A few SDL2 cleanups