Wave copy tweaks