Update code for Zelig 4.0