Fixes #118 and #119 for audio impl

TODO copy to Midi