Bump listen to 2.2.0 and fix subsequent bugs