More example fixes