I updated to El Capitan and now I can't set the boot drive as Windows from the Mac side, although I can boot into Windows from the boot sequence by holding down the Alt key.
Once I'm in Windows I can the set the boot drive to Mac, a bit weird, but it still all works except for that Mac side glitch.