Some fixes in circuit breaking, still sucks :'(