Minor update to wav handlers