Fixes to pass WAVE test