Fix more conflicts between audio and video in albums