SW Player fixes