couple fixes

Fix for the crash I introduced in my CR
Fix for audio not injected at the right position when options modified.