restore sdl_demo fixes