First pass changes for express 4.0