Fixed some of the ERC issues. A couple are still outstanding.