Fixes for multiple onCalls