More SDL2 stuff + CMake fix