Fixed A2DP and minor change