Fixed SAV width calculation bugs