Fix breakage / warnings caused by listen 1.0