Fix minor issues in structure section