cfg fixes wrt except finally