Make BFT zeus+unit switching compatible (#327, #1170)