Done some migration to SDL2