Examples tweaks, rebuild