Continue porting to SDL2