More example improvements