Avoid double barlines
Fix multiclef regression