Fixes for Express 4.X