WIP general: bug fixes

`e` is not used.