ERT-81 Various post-review improvements