#201 Fix other places that get wrong bitrate