[PATCH] generic dispatch fixes