Fix and make compatible with messageSurface and jsaSound