Fixes related to SDL2 implementation