Express 4 changes

@AndrewBryson do you mind if I merge this into master?