more vigor fixes