Fix a few bugs for ECNP 2014