Fixed some small issues brought up by ERC