Merge "Fix band selection problems."