Update to work with latest Rust and sdl2.rs