Cleaned up some ERC errors
More ERC errors left to fix