SDL2 Fixes, but I guess some issues are left. So far it compiles