More updates after express 4 migration