Some fixes for callback error