Update provisionals for CM and vanir

Hopefully this addresses the random FCs we are seeing. It is pretty much the
last thing I can try without having to do some major investigation.

references #248
references #276