[TW096] - Fixup wave reseting and instance credit in the end.