Improve high-bitrate profile handling