Tweaks to adapt to express 4.0