Fixes for changes in rust sdl2 v0.0.7