fix sanitizer issues due to latest reverb changes