Fixes for multiple callbacks