Improved bitrate switching