There's now a "Cancel Wave" button that should address the first of your issues...