Fixed more issues with new ResponseGenerator and ping