Merge "Fix band selection problems." into nyc-dev