Fix to variants and library example fixes.