fixes, upgrade of examples