Fix for stdlib changes
player: handle buffering and general state changes more correctly