Fix E23 bug and re-enable E23 CI