Fix violations in common