Fixes for wai-handler-launch