Improved music switching.