SW player fixes