Fixed some ERC errors - sonar layout